Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 27 10:13:44 PDT 2014