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