Sync'd branch integration/b2g-inbound with upstream @ Sun Oct  5 09:57:46 PDT 2014