Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 20 13:49:41 PDT 2014