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