Sync'd branch releases/aurora with upstream @ Fri Sep 26 10:56:32 PDT 2014