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