Sync'd branch releases/aurora with upstream @ Fri Sep 26 15:11:38 PDT 2014