Sync'd branch releases/aurora with upstream @ Fri Sep 19 11:35:35 PDT 2014