Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 15:43:42 PDT 2014