Sync'd branch releases/aurora with upstream @ Fri Sep 19 13:21:38 PDT 2014