Sync'd branch releases/aurora with upstream @ Fri Sep 19 14:46:37 PDT 2014