Describe: sync_20150323-3350-g576e4af
was 576e4af38fbf9c894ec0c40bf1ef7d2d991b026f----------------------------------------------------------------------- 576e4af38fbf9c894ec0c40bf1ef7d2d991b026f Fix various things that slipped in during sync. -----------------------------------------------------------------------
