Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 02:33:42 PDT 2014